Use compiler-libs as installed by upstream

As a side effect, add a dependency ocaml-interp -> ocaml-compiler-libs
since toplevel library has been moved there.

diff --git a/debian/control b/debian/control
index 746a6ff15d2aaf1b1531bf219bef53a6cd78ece2..dfe44f783c7b35bf8924f3d73034f15bda87186c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -232,6 +232,7 @@ Description: Sources for Objective Caml
 Package: ocaml-interp
 Architecture: any
 Depends:
+ ocaml-compiler-libs (= ${binary:Version}),
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}

diff --git a/debian/ocaml-base-nox.install.in b/debian/ocaml-base-nox.install.in
index 1f88353b3258f48f14f16252f6d35211fd6416be..07ed3ffaffe48ee7fe6caa85dd16a45d0cf9233a 100644 (file)
--- a/debian/ocaml-base-nox.install.in
+++ b/debian/ocaml-base-nox.install.in
@@ -61,9 +61,6 @@ DYN: @OCamlStdlibDir@/nums.cmxs
      @OCamlStdlibDir@/stringLabels.cmi
      @OCamlStdlibDir@/sys.cmi
      @OCamlStdlibDir@/weak.cmi
-     @OCamlStdlibDir@/toploop.cmi
-     @OCamlStdlibDir@/topdirs.cmi
-     @OCamlStdlibDir@/topmain.cmi
      @OCamlStdlibDir@/unix.cmi
      @OCamlStdlibDir@/unixLabels.cmi
      @OCamlStdlibDir@/str.cmi

diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in
index 132c9dee19028d9e99cbd4ceae1ad305c1c0e5b5..0b5345d74e3129c60c4cb6add9be21bb655ea919 100644 (file)
--- a/debian/ocaml-compiler-libs.install.in
+++ b/debian/ocaml-compiler-libs.install.in
@@ -1,3 +1 @@
-parsing/* @OCamlStdlibDir@/compiler-libs/parsing
-typing/* @OCamlStdlibDir@/compiler-libs/typing
-utils/* @OCamlStdlibDir@/compiler-libs/utils
+@OCamlStdlibDir@/compiler-libs

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 09fae8a2eb45ea56127eeac6d5ac33345ae239a8..8bfabd98d1c544dcd595d3b4f4b9414004f4a1ea 100644 (file)
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -17,7 +17,6 @@ OPT: usr/bin/ocamlbuild.native
 OPT: usr/bin/ocamlopt
 OPT: usr/bin/ocamloptp
      @OCamlStdlibDir@/stdlib.cma
-     @OCamlStdlibDir@/toplevellib.cma
      @OCamlStdlibDir@/dynlink.cma
 DYN: @OCamlStdlibDir@/dynlink.cmx
 DYN: @OCamlStdlibDir@/dynlink.cmxa
@@ -242,8 +241,6 @@ STD: obj.cmx
 STD: oo.ml
 STD: oo.mli
 STD: oo.cmx
-STD: outcometree.cmi
-STD: outcometree.mli
 STD: parsing.ml
 STD: parsing.mli
 STD: parsing.cmx
@@ -303,7 +300,6 @@ STD: sys.mli
 STD: sys.cmx
 STD: thread.mli
 STD: threadUnix.mli
-STD: topstart.cmo
 STD: unix.cmx
 STD: unix.cmxa
 STD: unix.mli